Revision: bazaar--annotate--1.2--patch-3
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sat Jan 22 20:02:40 EST 2005
Standard-date: 2005-01-22 09:02:40 GMT
New-files: doxygen.sh doxygen/.arch-ids/=id
    doxygen/.arch-ids/Doxyfile.id doxygen/.arch-inventory
    doxygen/Doxyfile
    libarch/tests/.arch-ids/unit-apply-changeset.c.id
    libarch/tests/unit-apply-changeset.c
    tests/.arch-ids/test-dot-orig.sh.id
    tests/test-dot-orig.sh
New-directories: doxygen doxygen/.arch-ids
Modified-files: commands/cmdutils.c commands/redo.c
    libarch/ancestry.c libarch/apply-changeset.c
    libarch/apply-changeset.h libarch/arch-cache.c
    libarch/arch-cache.h libarch/cached-archive.c
    libarch/changeset-utils.h libarch/commit.c
    libarch/patch-id.c libarch/patch-id.h
    libarch/tests/unit-patch-id.c po/en_AU.po
    tests/Makefile.in tests/test-commit.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-4
    robert.collins@canonical.com--general/bazaar--annotate--1.2--patch-3
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-83
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-84
    robert.collins@canonical.com--general/bazaar--devel--1.2--base-0
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-2
    robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--base-0
    robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-1
    robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-2
    robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-3
    thelove@canonical.com/bazaar--devo--1.1--patch-119
    thelove@canonical.com/bazaar--devo--1.1--patch-120
    thelove@canonical.com/bazaar--devo--1.1--patch-121
    thelove@canonical.com/bazaar--devo--1.1--patch-122
    thelove@canonical.com/bazaar--devo--1.2--base-0
    thelove@canonical.com/bazaar--devo--1.2--patch-1
    thelove@canonical.com/bazaar--devo--1.2--patch-2
    thelove@canonical.com/bazaar--devo--1.2--patch-3
Summary: merge in current 1.2 changes
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-4
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-5
   Fix double-newlines in ancestry files & get/put_line input validation

 * aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--base-0

 * aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-1
   Added script, configuration file and output directory for Doxygen

 * aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-2
   Added script, fixed configuration

 * aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-3
   Doxygenated the Arch Cache documentation

 * aaron.bentley@utoronto.ca--baz/bazaar--doxygen--1.2--patch-4
   Updated the documentation for cmdutils.c

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-83
   merge in aarons bugfix for the cache ancestry support

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-84
   teach ancestry not to connect to archives until it actually needs to

 * robert.collins@canonical.com--general/bazaar--devel--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-1

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-1
   merge in 1.1 and 1.1.1 release changes

 * robert.collins@canonical.com--general/bazaar--devel--1.2--patch-2
   .orig file support

 * robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-118

 * robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-1
   write basic .orig file support tests

 * robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-2
   begin refactoring to achieve .orig support

 * robert.collins@canonical.com--general/bazaar--dot-orig-support--1.1--patch-3
   implemented foo.orig support

 * thelove@canonical.com/bazaar--devo--1.1--patch-119
   do not use a cherry picked patch as a common text for a merge base point. closes: #5411

 * thelove@canonical.com/bazaar--devo--1.1--patch-120
   fixup en_AU coarse language

 * thelove@canonical.com/bazaar--devo--1.1--patch-121
   merge in aarons bugfix for the cache ancestry support

 * thelove@canonical.com/bazaar--devo--1.1--patch-122
   teach ancestry not to connect to archives until it actually needs to

 * thelove@canonical.com/bazaar--devo--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-119

 * thelove@canonical.com/bazaar--devo--1.2--patch-1
   Set up Doxygen, doxygenated Arch Cache

 * thelove@canonical.com/bazaar--devo--1.2--patch-2
   merge in 1.1 and 1.1.1 release changes

 * thelove@canonical.com/bazaar--devo--1.2--patch-3
   .orig file support

